From: Matthias Clasen <mclasen@redhat.com>
Date: Tue, 4 Dec 2012 23:32:59 +0000 (-0500)
Subject: EndSessionDialog: Add a Close method
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~4903
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=151c699f5c7e172c9f2478b753eb0b7ed74310e2;p=gnome-shell.git

EndSessionDialog: Add a Close method

When there are multiple sessions, we may get a polkit dialog in
response to clicking 'Reboot' in the end session dialog. If the
polkit dialog gets canceled or otherwise ends unsuccessfully,
we are left with the lightbox that the end session dialog puts
up when 'Reboot' is clicked. To remove the lightbox and make the
session fully functional again, gnome-session will call Close.

https://bugzilla.gnome.org/show_bug.cgi?id=688915
---

diff --git a/js/ui/endSessionDialog.js b/js/ui/endSessionDialog.js
index 57a7dcdb3..59fbae295 100644
--- a/js/ui/endSessionDialog.js
+++ b/js/ui/endSessionDialog.js
@@ -50,6 +50,7 @@ const EndSessionDialogIface = <interface name="org.gnome.SessionManager.EndSessi
     <arg type="u" direction="in" />
     <arg type="ao" direction="in" />
 </method>
+<method name="Close" />
 <signal name="ConfirmedLogout" />
 <signal name="ConfirmedReboot" />
 <signal name="ConfirmedShutdown" />
@@ -488,5 +489,9 @@ const EndSessionDialog = new Lang.Class({
                                         invocation.return_value(null);
                                         this.disconnect(signalId);
                                     }));
+    },
+
+    Close: function(parameters, invocation) {
+        this.close();
     }
 });